Enable ICONV and C++11 build

diff --git a/debian/changelog b/debian/changelog
index 363a644a7ce96af1079b810daaef617c83517fdf..37d6033a080ee30cd6b78bb1b8af40bcb13154e9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 dcmtk (3.6.1~20170228-1) unstable; urgency=medium
 
   * Upload to unstable Closes: #747167
-  * d/rules: correct enabling private tags, Closes: #859201
-  
+  * d/rules: - correct enabling private tags, Closes: #859201
+       - correctly enable ICONV, Closes: #701802
+       - enable C++11 build 
+ 
 
  -- Gert Wollny <gewo@debian.org>  Tue, 20 Jun 2017 18:58:39 +0000
 

diff --git a/debian/rules b/debian/rules
index dc8b8e02e36dc272875b34cb9f0fc6717bdac409..39595348c0d17bedc4c5225569c0514e4e6daf49 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,10 +36,14 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DDCMTK_WITH_TIFF:BOOL=ON \
  -DDCMTK_WITH_ZLIB:BOOL=ON \
  -DDCMTK_WITH_ICONV:BOOL=ON \
+ -DLIBICONV_LIBRARY:FILEPATH=/lib/$(DEB_HOST_MULTIARCH)/libc.so.6 \
+ -DLIBCHARSET_LIBRARY:FILEPATH=/lib/$(DEB_HOST_MULTIARCH)/libc.so.6 \
+ -DLIBCHARSET_INCLUDE_DIR:FILEPATH=/usr/include \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
  -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk11 \
- -DCMAKE_SKIP_RPATH:BOOL=OFF
+ -DCMAKE_SKIP_RPATH:BOOL=OFF \
+ -DCMTK_USE_CXX11_STL:BOOL=ON
 
 
 override_dh_auto_configure: